Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Jun 2010 22:51:37 +0000 (22:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Jun 2010 22:51:37 +0000 (22:51 +0000)
commit50e3b9c4fc1ff8ad57c3e2a39397c1ceb2d20fca
treea6a70b4315a804f508441394149899c60c521a40
parentcdc8c3d4cfd5f56ca0271ee1e677b4eb5ea0e71a
parent6458e96e151fc93dc45178e03650085c3aa1b3ea
Merge from mainline.